Merge commit 'origin/upstream-cvs' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Wed, 5 Aug 2009 22:32:39 +0000 (00:32 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Wed, 5 Aug 2009 22:32:39 +0000 (00:32 +0200)

Trivial merge